Rebase and merge